From 3f0efb216daf0f501271a118fae56fc907304b52 Mon Sep 17 00:00:00 2001
From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 20 Feb 2001 18:12:00 +0000
Subject: [PATCH] (read_char): When an event from unread-command-events is from
 the tool or menu bar, set *USE_MOUSE_MENU to 1.

---
 src/keyboard.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/keyboard.c b/src/keyboard.c
index cc2b41c4b9d..6401389ca5a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2141,6 +2141,12 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
 	  && NILP (XCDR (c)))
 	c = XCAR (c);
 
+      /* If the queued event is something that used the mouse,
+         set used_mouse_menu accordingly.  */
+      if (used_mouse_menu
+	  && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar)))
+	*used_mouse_menu = 1;
+      
       reread = 1;
       goto reread_for_input_method;
     }
-- 
2.30.2